Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 25 Feb 2010 21:56:02 +0000 (21:56 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 25 Feb 2010 21:56:02 +0000 (21:56 +0000)

Trivial merge